diff options
| -rw-r--r-- | .testr.conf | 2 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | testing/__init__.py | 16 | ||||
| -rw-r--r-- | testplans/releases.txt | 2 | ||||
| -rw-r--r-- | testplans/snapshots.txt | 2 | ||||
| -rw-r--r-- | tests/LicenseHelperTest.php (renamed from testing/LicenseHelperTest.php) | 0 | ||||
| -rw-r--r-- | tests/__init__.py | 16 | ||||
| -rw-r--r-- | tests/apache2.conf.tmpl (renamed from testing/apache2.conf.tmpl) | 0 | ||||
| -rw-r--r-- | tests/doctest_production_browser.py (renamed from testing/doctest_production_browser.py) | 0 | ||||
| -rw-r--r-- | tests/license_protected_file_downloader.py (renamed from testing/license_protected_file_downloader.py) | 0 | ||||
| -rw-r--r-- | tests/mime.types (renamed from testing/mime.types) | 0 | ||||
| -rw-r--r-- | tests/test_click_through_license.py (renamed from testing/test_click_through_license.py) | 2 | ||||
| -rw-r--r-- | tests/test_php_unit.py (renamed from testing/test_php_unit.py) | 2 | ||||
| -rw-r--r-- | tests/test_publish_to_snapshots.py (renamed from testing/test_publish_to_snapshots.py) | 0 |
14 files changed, 22 insertions, 22 deletions
diff --git a/.testr.conf b/.testr.conf index 34a6148..6e60b1c 100644 --- a/.testr.conf +++ b/.testr.conf @@ -1,3 +1,3 @@ [DEFAULT] test_command=python -m subunit.run $IDLIST -test_id_list_default=testing.test_suite +test_id_list_default=tests.test_suite @@ -133,4 +133,4 @@ detailed output, you may need to run phpunit directly. To run the tests separately, do the following: - $ phpunit testing/LicenseHelperTest + $ phpunit tests/LicenseHelperTest diff --git a/testing/__init__.py b/testing/__init__.py deleted file mode 100644 index ff8b7ce..0000000 --- a/testing/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -import os -import unittest - -from testing.test_click_through_license import * -from testing.test_publish_to_snapshots import * - - -def test_suite(): - module_names = [ - 'testing.test_click_through_license.TestLicense', - 'testing.test_publish_to_snapshots.TestSnapshotsPublisher', - 'testing.test_php_unit.PhpUnitTest', - ] - loader = unittest.TestLoader() - suite = loader.loadTestsFromNames(module_names) - return suite diff --git a/testplans/releases.txt b/testplans/releases.txt index c1db01f..5ca3de9 100644 --- a/testplans/releases.txt +++ b/testplans/releases.txt @@ -6,7 +6,7 @@ Navigate to the regular ST-E license-protected file and initiate download Import class we will use for this test and init browser object. - >>> from testing.doctest_production_browser import DoctestProductionBrowser + >>> from tests.doctest_production_browser import DoctestProductionBrowser >>> browser = DoctestProductionBrowser("http://releases.linaro.org/") Visiting homepage and check for title. diff --git a/testplans/snapshots.txt b/testplans/snapshots.txt index 12495f3..719790b 100644 --- a/testplans/snapshots.txt +++ b/testplans/snapshots.txt @@ -6,7 +6,7 @@ Navigate to the regular ST-E license-protected file and initiate download Import class we will use for this test and init browser object. - >>> from testing.doctest_production_browser import DoctestProductionBrowser + >>> from tests.doctest_production_browser import DoctestProductionBrowser >>> browser = DoctestProductionBrowser("http://snapshots.linaro.org/") Visiting homepage and check for title. diff --git a/testing/LicenseHelperTest.php b/tests/LicenseHelperTest.php index b7bc855..b7bc855 100644 --- a/testing/LicenseHelperTest.php +++ b/tests/LicenseHelperTest.php diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..a9da24d --- /dev/null +++ b/tests/__init__.py @@ -0,0 +1,16 @@ +import os +import unittest + +from tests.test_click_through_license import * +from tests.test_publish_to_snapshots import * + + +def test_suite(): + module_names = [ + 'tests.test_click_through_license.TestLicense', + 'tests.test_publish_to_snapshots.TestSnapshotsPublisher', + 'tests.test_php_unit.PhpUnitTest', + ] + loader = unittest.TestLoader() + suite = loader.loadTestsFromNames(module_names) + return suite diff --git a/testing/apache2.conf.tmpl b/tests/apache2.conf.tmpl index 4cfd851..4cfd851 100644 --- a/testing/apache2.conf.tmpl +++ b/tests/apache2.conf.tmpl diff --git a/testing/doctest_production_browser.py b/tests/doctest_production_browser.py index 0b5a157..0b5a157 100644 --- a/testing/doctest_production_browser.py +++ b/tests/doctest_production_browser.py diff --git a/testing/license_protected_file_downloader.py b/tests/license_protected_file_downloader.py index 5726a56..5726a56 100644 --- a/testing/license_protected_file_downloader.py +++ b/tests/license_protected_file_downloader.py diff --git a/testing/mime.types b/tests/mime.types index c4a3984..c4a3984 100644 --- a/testing/mime.types +++ b/tests/mime.types diff --git a/testing/test_click_through_license.py b/tests/test_click_through_license.py index f1e7e07..0f8643a 100644 --- a/testing/test_click_through_license.py +++ b/tests/test_click_through_license.py @@ -14,7 +14,7 @@ from license_protected_file_downloader import LicenseProtectedFileFetcher fetcher = LicenseProtectedFileFetcher() cwd = os.getcwd() docroot = cwd -srvroot = os.path.abspath(os.path.join(*([cwd] + ['testing']))) +srvroot = os.path.abspath(os.path.join(*([cwd] + ['tests']))) local_rewrite = 'RewriteCond %{REMOTE_ADDR} 127.0.0.1 [OR]' host = 'http://127.0.0.1' diff --git a/testing/test_php_unit.py b/tests/test_php_unit.py index f226f33..731d749 100644 --- a/testing/test_php_unit.py +++ b/tests/test_php_unit.py @@ -14,7 +14,7 @@ class PhpUnitTest(TestCase): super(PhpUnitTest, self).setUp() self.xml_path = tempfile.mkstemp()[1] if subprocess.Popen(['phpunit', '--log-junit', - self.xml_path, 'testing/LicenseHelperTest'], + self.xml_path, 'tests/LicenseHelperTest'], stdout=open('/dev/null', 'w'), stderr=subprocess.STDOUT).wait(): raise CommandNotFoundException("phpunit command not found. Please " diff --git a/testing/test_publish_to_snapshots.py b/tests/test_publish_to_snapshots.py index 870d404..870d404 100644 --- a/testing/test_publish_to_snapshots.py +++ b/tests/test_publish_to_snapshots.py |