Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 02:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/new/FTL-binary' into new/FTL-binary

Browse source 
# Conflicts:
#	test/test_automated_install.py
This commit is contained in:
Dan Schaper 2017-02-20 07:25:34 -08:00
commit e480c761cd
No known key found for this signature in database
GPG key ID: 572E999E385B7BFC
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
test/test_automated_install.py
View file

@ -355,7 +355,6 @@ def test_FTL_detect_unknown_no_errors(Pihole):
''') ''')
expected_stdout = 'Not able to detect architecture (unknown: mips)' expected_stdout = 'Not able to detect architecture (unknown: mips)'
assert expected_stdout in detectPlatform.stdout assert expected_stdout in detectPlatform.stdout
# Helper functions # Helper functions
def mock_command(script, args, container): def mock_command(script, args, container):
''' Allows for setup of commands we don't really want to have to run for real in unit tests ''' ''' Allows for setup of commands we don't really want to have to run for real in unit tests '''