295 Commits (master)

Author	SHA1	Message	Date
Mcat12	d67122dffc	Pin the Fedora test docker container to 29 ... The tests are currently failing due to a change in Fedora 30, which we are not currently supporting. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	5 years ago
pvogt09	efbd42f7b5	Moves creation of pihole user before FTL installation ... Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>	5 years ago
DL6ER	7479485d45	Add test for the case the binary variable is unset (defaults to "tbd" in this case) ... Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
DL6ER	d26f2dcb2c	Use global binary variable in tests for automated install ... Signed-off-by: DL6ER <dl6er@dl6er.de>	5 years ago
Mark Drobnak	1789a2db29	Merge pull request #2384 from pi-hole/feature/install-privacy-level ... Set FTL Privacy Level During Install	6 years ago
bcambl	6f8e8e98bb	update centos version check test ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	6 years ago
Mcat12	c22e94c9c7	Update test to include empty FTL config ... The installer ensures that an FTL config will exist, and creates an empty file if it doesn't. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
DL6ER	f5c3dc5d9d	Improve download error message that is shown when downloading or verifying the binary failed ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Adam Hill	b04195041a	Update README.md	6 years ago
Adam Hill	8ca4c66e3c	make smarter assertions rathe than `largestring not in string` ... Signed-off-by: Adam Hill <adam@diginc.us>	6 years ago
Adam Hill	449b7bf6e4	reduce the amount of strict `not in` checks ... Signed-off-by: Adam Hill <adam@diginc.us>	6 years ago
Adam Hill	88e4b6390c	Tox! ... Signed-off-by: Adam Hill <adam@diginc.us>	6 years ago
bcambl	fff31558a0	assert REMI repository is not installed for Fedora ... - fix whiptail mock comments to clarify continue vs cancel Signed-off-by: bcambl <blayne@blaynecampbell.com>	6 years ago
bcambl	4c23964964	ensure images are build prior to running tests ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	6 years ago
bcambl	d4addd53ad	Add tests for Fedora/CentOS distro_check ... - test to ensure installer behavior with unsupported CentOS releases - test to ensure repository enablement - test to ensure PHP upgrade opt-in/opt-out behavior Signed-off-by: bcambl <blayne@blaynecampbell.com>	6 years ago
bcambl	09d40679c0	add test for unsupported distro checking ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	6 years ago
bcambl	553aad6ed2	add Fedora container to test matrix ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	6 years ago
bcambl	5ca2ad6148	move test globals & mock commands to conftest ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	6 years ago
bcambl	40537e1522	python linting: missing whitespace after ',' (E231) ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	6 years ago
bcambl	064a75b21b	python linting: missing whitespace around operator (E225) ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	6 years ago
bcambl	1d3445bc0f	python linting: whitespace after '(' and before ')' (E201 & E202) ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	6 years ago
bcambl	79232d02c9	python linting: 'pytest' imported but unused (F401) ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	6 years ago
bcambl	9bd4986781	python linting: whitespace before ':' (E203) ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	6 years ago
bcambl	c3d443aaff	python linting: lines > 79 characters (E501) ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	6 years ago
bcambl	da3dfd0998	python linting: missing whitespace after ':' (E231) ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	6 years ago
bcambl	4468d81472	python linting: 2 lines prior to defs (E302) ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	6 years ago
bcambl	9d3d33b6a2	add tests for selinux checking ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	6 years ago
Adam Warner	8cf8da4c78	- Check file /etc/pihole/ftlbranch for current FTL branch, download from github if master, or pi-hole.net if other ... - Check if downloaded binary file can resolve queries, if so stop and disable dnsmasq - Add service_disable function - Add dependency libcap2-bin on debian to enable setcap. Need to check other distos -Always download FTL binary if /etc/pihole/ftlbranch does not contain "master" - Change some strings/variables that reference dnsmasq and change them to pihole/pihole-FTL Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
WaLLy3K	26afe04926	Remove index.js test	7 years ago
Adam Warner	42b5574f9b	remove no longer needed tests ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
WaLLy3K	fdf2649f2f	Clean up known remaining colour output issues (#1613) ... * Print newline on error message * Output last three lines of error if update fails * Consistent error messages & housekeeping * Add shellcheck directive to ignore COL_TABLE * Quoted and braced variables for codebase consistency * Escaped newlines correctly * Made error messages consistent (indenting and wording) * Removed consecutive echos * Conditional formatting consistency * Braced, quoted and used [[ on conditionals * Fix specific ShellCheck issues * Fixed issues that could be safely changed without extensive testing * Update SELinux whiptail behaviour & more * Colourised some strings * Fixed multiple line string indenting * Made output consistent with existing codebase * Removed sequential echos * Make SELinux whiptail use "--defaultno", and change text wording * Add help text for hostrecord, and colourise output * this should fix the tests... Signed-off-by: Adam Warner <adamw@rner.email> * revert changes to `update_package_cache()` to prove tests Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Mcat12	b09c660833	Always process DNS and DHCP settings in installer (#1630) ... * Always process DNS and DHCP settings in installer * Make sure dnsmasq config exists before modifying it Signed-off-by: Mcat12 <newtoncat12@yahoo.com> * Make sure the dnsmasq config directory exists Signed-off-by: Mcat12 <newtoncat12@yahoo.com> * Only remove the DHCP config if it exists (fixes tests, hopefully) Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	7 years ago
Adam Warner	bf70c2c660	initial changes to tests to take into account changes to strings ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Dan Schaper	c29c4ceb0f	Integrate DL's update.sh fixes. ... `shellcheck -x` for following files. Do not test for included files SC1091 Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	07fc047dd8	Remove testing for `debug` as this is getting a re-write by Jacob. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	0c2827e130	Test exclusion for sourced files SC1090. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Adam Warner	536585b846	Colourise Core Output Text (#1471) ... * Define colours within COL_TABLE * Do not output colours for non-terminal instances * Removed ":::" * Fixed indenting & spacing * Made output consistent throughout project * Reworded text to fit on standard 80 char wide Terminal screen * Made 'sudo raspi-config' warning (insufficient disk space) only show on RPi * Make "Installation/Update Complete" the final msg * Remove redundant messages * Simplify update available message * Confirm user would like to begin uninstall * If "git pull" string says "Already up-to-date.", place [i] before it * Colour Temp/Interface output * Made `pihole disable 5z` invalid * Added error fallback if invalid argument (not s/m) is detected * Quoted "$2" for consistency * Updated help text * L185/286: Replaced echo with redirect * User agents for adblock.mahakala.is/adaway.org unnecessary * Print newline on confirmation of repository reset * Add output to admin-related dnsmasq restarts * Return error message for "pihole -q" * Imply default checkout behaviour with y/N * Fix uninstall failing to remove pihole user * Print checkout 'git remote show origin' STDERR on new line * Replaced checkout "AdminLTE" wording with "Web Admin"	7 years ago
DL6ER	939055f19c	Revert "Add FTL tests to the test suite (#1510)" (#1519) ... This reverts commit cf6a1ac9ad.	7 years ago
DL6ER	cf6a1ac9ad	Add FTL tests to the test suite (#1510) ... * Add first version of FTL tests * Wait one second to allow FTL to start up and analyze our mock log * Add test_FTL_telnet_statistics * Added test_FTL_telnet_top_clients * Add test_FTL_telnet_top_domains	7 years ago
DL6ER	01e091fd17	Prefer ULA over GUA addresses [IPv6] (#1508) ... * On installs with GUA and ULA's we should prefer ULA's as it's been demonstrated that GUA's can and often are rotated by ISPs. Fixes #1473 * Add test for link-local address detection * Add ULA-only and GUA-only tests * Add test_IPv6_GUA_ULA_test and test_IPv6_ULA_GUA_test * Add "" * Add mock_command_2 command that can mock a command with more than one argument (as "ip -6 address") and result multiple lines of results * Make mock_command_2 more similar to the original mock_command * Correct comments * Fixed remaining comments * Fixed one last comment... * Fixed a comment...	7 years ago
georou	6c56665403	updated travis for new firewalld add service	7 years ago
Dan Schaper	dcb9797f35	Tests changed to reflect `uname` calls. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
DL6ER	e9b50442fa	Remove test_FTL_support_files_installed as we create them using the init.d script as of now	7 years ago
Dan Schaper	02ea9b9abc	Check file path and permissions in one go. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	4cd598ae10	Check support files installed and permissions. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	8eeb8ad779	Check binary installed and functional. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	70e876ee13	Download tests. ... Make sure we download a binary and not just get the GitHub page. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	7a269e757e	Debian buildpack image for docker (Need `curl` for testing, using scm version to add `curl` and `git`.) ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	87edbeaf58	Factor out downloader from detector function. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	339f95b00c	Change from `uname -m` to straight `arch` ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	e480c761cd	Merge remote-tracking branch 'origin/new/FTL-binary' into new/FTL-binary ... # Conflicts: # test/test_automated_install.py	7 years ago
Dan Schaper	26c628f8a5	Mock ldd command response. ... Test aarch64 detection Arm v6/v7 little endian. x86_64 native Test aarch64 detection Unknown platform detection. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	59d6907d71	Test aarch64 detection ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	b4450a3918	Mock ldd command response. ... Test aarch64 detection Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	7032be6049	Template for FTL engine type tests. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	439999cb62	Last rule check.	7 years ago
Dan Schaper	409f76aa34	Error check.	7 years ago
Dan Schaper	54e2c6181a	Populate all required variables with a distro check.	7 years ago
Dan Schaper	2a5587f236	Test for failure.	7 years ago
Dan Schaper	2d18b2d784	Start test templates.	7 years ago
Dan Schaper	d5587e32d0	Populated directory test	7 years ago
Dan Schaper	28eb348707	Individual Page tests	7 years ago
Dan Schaper	91bcc18e6a	Make full path to directory for pihole web page.	7 years ago
Dan Schaper	5b43f13935	Fresh install web page directory tests	7 years ago
Dan Schaper	0bbe0aed83	Last of the IPTables tests, new test rig is operating.	7 years ago
Dan Schaper	b16f797317	`firewall-cmd --state` returns 0 on 'running' non 0 on 'not running', ... so check retval and not text returned. FirewallD conversion to multicall IPTables test	7 years ago
Dan Schaper	4bb71ae046	IPtables tests. ... mock commands for iptables check. Test setting IPTables ruleset. Test setting IPTables ruleset. Test for already configured IPTables rules. Test for addition of iptables rules. Can only mock so deep in the commands.	7 years ago
Dan Schaper	679b098aa7	No firewall enabled test.	7 years ago
Dan Schaper	e0e88fdb52	Start IPTables test, get baseline for commands in the container. See ... what we have to mock to start testing.	7 years ago
Dan Schaper	8529c1287f	Full test suite for firewallD configuration.	7 years ago
Dan Schaper	9c7f7756b4	Revert second test.	7 years ago
Dan Schaper	f1cfb16bf9	Test firewallD enabled and disabled.	7 years ago
Dan Schaper	95796e1978	Only expect text output, not the leader `:::`	7 years ago
Dan Schaper	968b981ecb	Try mocking whiptail	7 years ago
Dan Schaper	3aeb378b56	Fix moved incorrect blocks.	7 years ago
Dan Schaper	28bafe7427	Rename test for firewallD, running state.	7 years ago
Dan Schaper	1317b67657	Attempt at modifying firewall rules for testing.	7 years ago
Dan Schaper	a48518d234	Update test rig for new firewalld ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	3ca21d8c8a	Merge pull request #931 from pi-hole/update_tests ... Add piholeDebug to CI Travis tests	8 years ago
Dan Schaper	808503d526	Add piholeDebug to tests	8 years ago
diginc	b9f3493dbc	move PH_TRUE to Dockerfiles to DRY	8 years ago
Adam Hill	c2930b0ca5	remove the debug print in mock_command	8 years ago
diginc	5b54b9cb11	update Pihole fixture comment	8 years ago
diginc	d2f815bba7	no longer need to write bash test scripts	8 years ago
diginc	a5a067d50f	switching testinfra's Docker run from dash to bash	8 years ago
diginc	699e299345	add a comment about bash vs dash. future refact needed	8 years ago
diginc	05e114173d	update comments, add configureFirewall test ... * Comments to clarify some of the existing tests * mock_command to allow recording of calls and mocking return calls in bash * new configureFirewall test (only the first one of it's many paths)	8 years ago
diginc	0d7e06a141	remove old pytest output file	8 years ago
Dan Schaper	a1a9a7fa9e	Clarify which DNS entry we are modifying.	8 years ago
Dan Schaper	07029f93e3	Match team convention in naming.	8 years ago
Dan Schaper	e99ef9c093	Cap the variables and echo out the proper environment.	8 years ago
Dan Schaper	fef9ab674e	Pi-hole CORE installer variables are being changed to standardize scripts.	8 years ago
diginc	7548d9a8fe	point shellcheck at update.sh instead	8 years ago
diginc	97c44042e1	Adding failing shellcheck test and results ... Should be useful for showing others why other changes were made in the next commit.	8 years ago
diginc	a03caea549	setupVar tests passing for debian & centos	8 years ago