From 87e0599130abf9bb6d3aa0c886eded5f9227e69b Mon Sep 17 00:00:00 2001
From: Edwin Eefting <edwin@datux.nl>
Date: Sun, 17 May 2020 22:24:55 +0200
Subject: [PATCH] also test python 2.7

---
 .travis.yml           | 1 +
 basetest.py           | 4 ++--
 requirements.txt      | 1 +
 run_tests             | 2 +-
 test_executenode.py   | 2 +-
 test_thinner.py       | 6 +++---
 test_zfsautobackup.py | 4 ++--
 test_zfsnode.py       | 4 ++--
 8 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 861f5ee..f6f6d7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: python
 python:
   - "3.6"
+  - "2.7"
 before_install:
   - sudo apt-get update
   - sudo apt-get install zfsutils-linux
diff --git a/basetest.py b/basetest.py
index 791c606..80847e4 100644
--- a/basetest.py
+++ b/basetest.py
@@ -4,7 +4,7 @@ import subprocess
 import random
 
 #default test stuff
-import unittest
+import unittest2
 import subprocess
 import time
 from pprint import *
@@ -17,7 +17,7 @@ def shelltest(cmd):
     """execute and print result as nice copypastable string for unit tests (adds extra newlines on top/bottom)"""
     ret=(subprocess.check_output(cmd , shell=True).decode('utf-8'))
     print("######### result of: {}".format(cmd))
-    print(ret,end='')
+    print(ret)
     print("#########")
     ret='\n'+ret
     return(ret)
diff --git a/requirements.txt b/requirements.txt
index 77b327d..e1fd890 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,3 +2,4 @@ colorama
 argparse
 coverage==4.5.4
 python-coveralls
+unittest2
diff --git a/run_tests b/run_tests
index 9e81522..fce3f15 100755
--- a/run_tests
+++ b/run_tests
@@ -16,7 +16,7 @@ if ! [ -e /root/.ssh/id_rsa ]; then
     ssh -oStrictHostKeyChecking=no localhost true || exit 1
 fi
 
-coverage run --source bin.zfs_autobackup -m unittest -v $@ 
+coverage run --source bin.zfs_autobackup -m unittest -v
 EXIT=$?
 
 echo 
diff --git a/test_executenode.py b/test_executenode.py
index a0cd4ae..0b9cc6a 100644
--- a/test_executenode.py
+++ b/test_executenode.py
@@ -3,7 +3,7 @@ from basetest import *
 
 print("THIS TEST REQUIRES SSH TO LOCALHOST")
 
-class TestExecuteNode(unittest.TestCase):
+class TestExecuteNode(unittest2.TestCase):
 
     # def setUp(self):
 
diff --git a/test_thinner.py b/test_thinner.py
index 49e28d0..54e1b2e 100644
--- a/test_thinner.py
+++ b/test_thinner.py
@@ -11,11 +11,11 @@ class Thing:
         return("{}".format(time.strftime("%Y-%m-%d %H:%M:%S",struct)))
 
 
-class TestThinner(unittest.TestCase):
+class TestThinner(unittest2.TestCase):
 
-    def setUp(self):
+    # def setUp(self):
 
-        return super().setUp()
+        # return super().setUp()
 
     def test_incremental(self):
         ok=['2023-01-01 10:09:50',
diff --git a/test_zfsautobackup.py b/test_zfsautobackup.py
index 239121b..80c5908 100644
--- a/test_zfsautobackup.py
+++ b/test_zfsautobackup.py
@@ -1,11 +1,11 @@
 from basetest import *
 
 
-class TestZfsAutobackup(unittest.TestCase):
+class TestZfsAutobackup(unittest2.TestCase):
 
     def setUp(self):
         prepare_zpools()
-        return super().setUp()
+        # return super(TestZfsAutobackup,self).setUp()
 
     def  test_defaults(self):
         with self.subTest("defaults with full verbose and debug"):
diff --git a/test_zfsnode.py b/test_zfsnode.py
index 84a697b..7ca2aa4 100644
--- a/test_zfsnode.py
+++ b/test_zfsnode.py
@@ -1,11 +1,11 @@
 from basetest import *
 
 
-class TestZfsNode(unittest.TestCase):
+class TestZfsNode(unittest2.TestCase):
 
     def setUp(self):
         prepare_zpools()
-        return super().setUp()
+        # return super().setUp()
 
 
     def test_consistent_snapshot(self):