Changed tests

ecthros · Dec 3, 2016 · 04ea04d · 04ea04d
1 parent 231c411
commit 04ea04d
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/tests.py b/tests.py
@@ -6,7 +6,8 @@
 prompt = Fore.BLUE + ">> " + Fore.RESET
 
 def base_test():
-<<<<<<< HEAD
+    cli = pexpect.spawn("sudo python cli.py")
+    cli.expect(re.escape(prompt))
     pass
 
 def padding_tests():
@@ -18,9 +19,7 @@ def padding_tests():
     print pad("123456789876")
     print pad("a")
     pass
+
+
 padding_tests()
-=======
-    cli = pexpect.spawn("sudo python cli.py")
-    cli.expect(re.escape(prompt))
 
->>>>>>> 9219848aa75d979a0ca9a6219a9a863455aa8158