(1) Many tests have moved from foo.py to foo_test.py, so that needs changing in the TESTS variable. (2) Add a $PATH that includes /sbin and /usr/sbin so losetup and storage commands work. (3) Change PYTHONPATH to include new pyanaconda directory. --- tests/Makefile.am | 4 ++++ tests/kickstart_test/Makefile.am | 4 ++-- tests/storage_test/devicelibs_test/Makefile.am | 12 ++++++------ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index ee05e48..147c551 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -20,3 +20,7 @@ SUBDIRS = mock kickstart_test storage_test regex MAINTAINERCLEANFILES = Makefile.in + +TESTS_ENVIRONMENT = PATH=/sbin:/usr/sbin:$$PATH PYTHONPATH=$(top_builddir)/tests:$(top_builddir)/isys/.libs:$(top_builddir)/isys:$(top_builddir)/pyanaconda + +TESTS = fw_test.py diff --git a/tests/kickstart_test/Makefile.am b/tests/kickstart_test/Makefile.am index 2483f65..5f5d626 100644 --- a/tests/kickstart_test/Makefile.am +++ b/tests/kickstart_test/Makefile.am @@ -21,6 +21,6 @@ EXTRA_DIST = *.py MAINTAINERCLEANFILES = Makefile.in -TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir)/isys/.libs:$(top_builddir)/isys:$(top_builddir) +TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir)/tests:$(top_builddir)/isys/.libs:$(top_builddir)/pyanaconda:$(top_builddir) -TESTS = commands.py +TESTS = commands_test.py diff --git a/tests/storage_test/devicelibs_test/Makefile.am b/tests/storage_test/devicelibs_test/Makefile.am index fe45306..bb8efcf 100644 --- a/tests/storage_test/devicelibs_test/Makefile.am +++ b/tests/storage_test/devicelibs_test/Makefile.am @@ -21,10 +21,10 @@ EXTRA_DIST = *.py MAINTAINERCLEANFILES = Makefile.in -TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir)/isys/.libs:$(top_builddir)/isys:$(top_builddir) +TESTS_ENVIRONMENT = PATH=/sbin:/usr/sbin:$$PATH PYTHONPATH=$(top_builddir)/tests:$(top_builddir)/isys/.libs:$(top_builddir)/pyanaconda:$(top_builddir) -TESTS = crypto.py \ - lvm.py \ - mdraid.py \ - mpath.py \ - swap.py +TESTS = crypto_test.py \ + lvm_test.py \ + mdraid_test.py \ + mpath_test.py \ + swap_test.py -- 1.7.0.1 _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list
