From ab5fcc807f48eefa032c8a07ff79e9e5bd6b93a6 Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Thu, 9 Jun 2016 09:40:32 +0200
Subject: move SkipTest definition to tests/unittests/helpers.py to be reusable

---
 tests/unittests/helpers.py                          | 17 +++++++++++++++++
 .../test_handler_apt_configure_sources_list.py      | 21 ++-------------------
 2 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'tests')

diff --git a/tests/unittests/helpers.py b/tests/unittests/helpers.py
index 50b2bd72..59361215 100644
--- a/tests/unittests/helpers.py
+++ b/tests/unittests/helpers.py
@@ -344,3 +344,20 @@ except AttributeError:
                     print(reason, file=sys.stderr)
             return wrapper
         return decorator
+
+# on SkipTest:
+#  - unittest SkipTest is first preference, but it's only available
+#    for >= 2.7
+#  - unittest2 SkipTest is second preference for older pythons.  This
+#    mirrors logic for choosing SkipTest exception in testtools
+#  - if none of the above, provide custom class
+try:
+    from unittest.case import SkipTest
+except ImportError:
+    try:
+        from unittest2.case import SkipTest
+    except ImportError:
+        class SkipTest(Exception):
+            """Raise this exception to mark a test as skipped.
+            """
+            pass
diff --git a/tests/unittests/test_handler/test_handler_apt_configure_sources_list.py b/tests/unittests/test_handler/test_handler_apt_configure_sources_list.py
index c3043b14..2e604216 100644
--- a/tests/unittests/test_handler/test_handler_apt_configure_sources_list.py
+++ b/tests/unittests/test_handler/test_handler_apt_configure_sources_list.py
@@ -7,23 +7,6 @@ import shutil
 import tempfile
 import socket
 
-# on SkipTest:
-#  - unittest SkipTest is first preference, but it's only available
-#    for >= 2.7
-#  - unittest2 SkipTest is second preference for older pythons.  This
-#    mirrors logic for choosing SkipTest exception in testtools
-#  - if none of the above, provide custom class
-try:
-    from unittest.case import SkipTest
-except ImportError:
-    try:
-        from unittest2.case import SkipTest
-    except ImportError:
-        class SkipTest(Exception):
-            """Raise this exception to mark a test as skipped.
-            """
-            pass
-
 try:
     from unittest import mock
 except ImportError:
@@ -153,8 +136,8 @@ class TestAptSourceConfigSourceList(t_help.FilesystemMockingTestCase):
             testsock.connect((target, 80))
             testsock.close()
         except socket.error:
-            raise SkipTest("Test skipped: no network connectivity to %s"
-                           % target)
+            raise t_help.SkipTest("Test skipped: no network connectivity to %s"
+                                  % target)
 
     def test_apt_srcl_debian_mirrorfail(self):
         """Test rendering of a source.list from template for debian"""
-- 
cgit v1.2.3