summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Pokorný <jpokorny@redhat.com>2014-11-10 17:51:30 +0100
committerJan Pokorný <jpokorny@redhat.com>2014-11-14 22:10:52 +0100
commit436968e80bfb355ad1306be55d8aada4ff1fb5a0 (patch)
treea568b024b8858cee867e9130e83b5aa4d5655b7a
parent1e88d344c1d4855ed89f4db87f3c141908efe3f7 (diff)
downloadclufter-436968e80bfb355ad1306be55d8aada4ff1fb5a0.tar.gz
clufter-436968e80bfb355ad1306be55d8aada4ff1fb5a0.tar.xz
clufter-436968e80bfb355ad1306be55d8aada4ff1fb5a0.zip
tests/_gone -> _gone: same lines even for singly nested tests
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
-rw-r--r--_gone11
l---------[-rw-r--r--]tests/_gone12
-rw-r--r--tests/ccs2coroxml.py2
-rw-r--r--tests/filter.py2
-rw-r--r--tests/filter_manager.py2
-rw-r--r--tests/format.py2
-rw-r--r--tests/format_manager.py2
-rw-r--r--tests/run_cmd.py2
-rw-r--r--tests/utils.py2
-rw-r--r--tests/utils_cib.py2
-rw-r--r--tests/utils_cluster.py2
-rw-r--r--tests/utils_xml.py2
12 files changed, 22 insertions, 21 deletions
diff --git a/_gone b/_gone
new file mode 100644
index 0000000..55e1f0c
--- /dev/null
+++ b/_gone
@@ -0,0 +1,11 @@
+# -*- coding: UTF-8 -*-
+# Copyright 2014 Red Hat, Inc.
+# Part of clufter project
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+"""Bootstrap main runner"""
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
+
+
+if __name__ == '__main__':
+ from unittest import main
+ main()
diff --git a/tests/_gone b/tests/_gone
index 55e1f0c..c153e5a 100644..120000
--- a/tests/_gone
+++ b/tests/_gone
@@ -1,11 +1 @@
-# -*- coding: UTF-8 -*-
-# Copyright 2014 Red Hat, Inc.
-# Part of clufter project
-# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
-"""Bootstrap main runner"""
-__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
-
-
-if __name__ == '__main__':
- from unittest import main
- main()
+../_gone \ No newline at end of file
diff --git a/tests/ccs2coroxml.py b/tests/ccs2coroxml.py
index 5aebc8a..1781c23 100644
--- a/tests/ccs2coroxml.py
+++ b/tests/ccs2coroxml.py
@@ -20,4 +20,4 @@ class Main(CommonFilterTestCase):
print out_obj('bytestring')
-from os.path import join, dirname as d; execfile(join(d(__file__), '_gone'))
+from os.path import join, dirname as d; execfile(join(d(d(__file__)), '_gone'))
diff --git a/tests/filter.py b/tests/filter.py
index 1e31d7b..43d2449 100644
--- a/tests/filter.py
+++ b/tests/filter.py
@@ -67,4 +67,4 @@ class XMLTraverse(TestCase):
self.assertTrue(ret == RESULT_DIRECT_XSLT)
-from os.path import join, dirname as d; execfile(join(d(__file__), '_gone'))
+from os.path import join, dirname as d; execfile(join(d(d(__file__)), '_gone'))
diff --git a/tests/filter_manager.py b/tests/filter_manager.py
index 88c7e5c..09f7ca2 100644
--- a/tests/filter_manager.py
+++ b/tests/filter_manager.py
@@ -94,4 +94,4 @@ class CompositeFormatIO(FilterManagerTestCase):
norm_whitespace(f.read()))
-from os.path import join, dirname as d; execfile(join(d(__file__), '_gone'))
+from os.path import join, dirname as d; execfile(join(d(d(__file__)), '_gone'))
diff --git a/tests/format.py b/tests/format.py
index 2eeb569..7024ece 100644
--- a/tests/format.py
+++ b/tests/format.py
@@ -93,4 +93,4 @@ class XMLValidationTestCase(TestCase):
self.assertTrue(entries)
-from os.path import join, dirname as d; execfile(join(d(__file__), '_gone'))
+from os.path import join, dirname as d; execfile(join(d(d(__file__)), '_gone'))
diff --git a/tests/format_manager.py b/tests/format_manager.py
index 0fb560f..7d749d2 100644
--- a/tests/format_manager.py
+++ b/tests/format_manager.py
@@ -52,4 +52,4 @@ class Injection(FormatManagerTestCase):
self.assertEqual(fmt_cls, formats[fmt_id])
-from os.path import join, dirname as d; execfile(join(d(__file__), '_gone'))
+from os.path import join, dirname as d; execfile(join(d(d(__file__)), '_gone'))
diff --git a/tests/run_cmd.py b/tests/run_cmd.py
index 0d83bfd..d54f0d1 100644
--- a/tests/run_cmd.py
+++ b/tests/run_cmd.py
@@ -72,4 +72,4 @@ class Main(TestCase):
#pprint(outputs['coro']['passout'])
-from os.path import join, dirname as d; execfile(join(d(__file__), '_gone'))
+from os.path import join, dirname as d; execfile(join(d(d(__file__)), '_gone'))
diff --git a/tests/utils.py b/tests/utils.py
index d779763..ca0dd45 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -40,4 +40,4 @@ class FuncDefaultsVarnames(TestCase):
self.assertEqual(len(varnames), 2)
-from os.path import join, dirname as d; execfile(join(d(__file__), '_gone'))
+from os.path import join, dirname as d; execfile(join(d(d(__file__)), '_gone'))
diff --git a/tests/utils_cib.py b/tests/utils_cib.py
index 6e8ac9f..2d56e23 100644
--- a/tests/utils_cib.py
+++ b/tests/utils_cib.py
@@ -25,4 +25,4 @@ class TestResourceSpec(TestCase):
self.assertTrue(rs.res_type == 'smb')
-from os.path import join, dirname as d; execfile(join(d(__file__), '_gone'))
+from os.path import join, dirname as d; execfile(join(d(d(__file__)), '_gone'))
diff --git a/tests/utils_cluster.py b/tests/utils_cluster.py
index 832c09f..8140398 100644
--- a/tests/utils_cluster.py
+++ b/tests/utils_cluster.py
@@ -47,4 +47,4 @@ class TestClusterSystem(TestCase):
self.assertFalse(cluster_pcs_1_2('linux', ('debian', 'squeeze')))
-from os.path import join, dirname as d; execfile(join(d(__file__), '_gone'))
+from os.path import join, dirname as d; execfile(join(d(d(__file__)), '_gone'))
diff --git a/tests/utils_xml.py b/tests/utils_xml.py
index a306da3..60bd780 100644
--- a/tests/utils_xml.py
+++ b/tests/utils_xml.py
@@ -33,4 +33,4 @@ class TestRngPivot(TestCase):
self.assertTrue(etree.tostring(et) == expected)
-from os.path import join, dirname as d; execfile(join(d(__file__), '_gone'))
+from os.path import join, dirname as d; execfile(join(d(d(__file__)), '_gone'))