9fb9198f67
...beyond booth-1.0 (commit f2d38ce), including: . support for solely manually managed tickets (9a365f9) . use asciidoctor instead of asciidoc for generating man pages (65e6a6b) - switch to using Python 3 for the tests instead of Python 2 (behind unversioned "python" references; rhbz#1555651) Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
91 lines
2.3 KiB
Diff
91 lines
2.3 KiB
Diff
From 6a6834a8110d9e6aff50cd6d6935976af4cbdb8f Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
|
|
Date: Thu, 12 Jul 2018 20:18:07 +0200
|
|
Subject: [PATCH] test: drop/comment out superfluous imports
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
|
|
---
|
|
test/boothrunner.py | 2 --
|
|
test/boothtestenv.py | 1 -
|
|
test/runtests.py.in | 3 +--
|
|
test/serverenv.py | 2 --
|
|
test/servertests.py | 1 -
|
|
5 files changed, 1 insertion(+), 8 deletions(-)
|
|
|
|
diff --git a/test/boothrunner.py b/test/boothrunner.py
|
|
index 347912b..31c2213 100644
|
|
--- a/test/boothrunner.py
|
|
+++ b/test/boothrunner.py
|
|
@@ -1,8 +1,6 @@
|
|
-import os
|
|
import sys
|
|
import subprocess
|
|
import time
|
|
-import unittest
|
|
|
|
class BoothRunner:
|
|
default_config_file = '/etc/booth/booth.conf'
|
|
diff --git a/test/boothtestenv.py b/test/boothtestenv.py
|
|
index 59e25c3..ba54360 100644
|
|
--- a/test/boothtestenv.py
|
|
+++ b/test/boothtestenv.py
|
|
@@ -5,7 +5,6 @@ import tempfile
|
|
import unittest
|
|
|
|
from assertions import BoothAssertions
|
|
-from boothrunner import BoothRunner
|
|
|
|
class BoothTestEnvironment(unittest.TestCase, BoothAssertions):
|
|
test_src_path = os.path.abspath(os.path.dirname(__file__))
|
|
diff --git a/test/runtests.py.in b/test/runtests.py.in
|
|
index ec59159..73d70a3 100644
|
|
--- a/test/runtests.py.in
|
|
+++ b/test/runtests.py.in
|
|
@@ -1,7 +1,6 @@
|
|
#!@PYTHON_SHEBANG@
|
|
|
|
import os
|
|
-import re
|
|
import shutil
|
|
import sys
|
|
import tempfile
|
|
@@ -10,7 +9,7 @@ import unittest
|
|
|
|
from clienttests import ClientConfigTests
|
|
from sitetests import SiteConfigTests
|
|
-from arbtests import ArbitratorConfigTests
|
|
+#from arbtests import ArbitratorConfigTests
|
|
|
|
if __name__ == '__main__':
|
|
if os.geteuid() == 0:
|
|
diff --git a/test/serverenv.py b/test/serverenv.py
|
|
index 5d6c6c4..7b8915d 100644
|
|
--- a/test/serverenv.py
|
|
+++ b/test/serverenv.py
|
|
@@ -1,9 +1,7 @@
|
|
import os
|
|
import re
|
|
import time
|
|
-import unittest
|
|
|
|
-from assertions import BoothAssertions
|
|
from boothrunner import BoothRunner
|
|
from boothtestenv import BoothTestEnvironment
|
|
from utils import get_IP
|
|
diff --git a/test/servertests.py b/test/servertests.py
|
|
index 288d19f..f72dbed 100644
|
|
--- a/test/servertests.py
|
|
+++ b/test/servertests.py
|
|
@@ -1,5 +1,4 @@
|
|
import copy
|
|
-from pprint import pprint, pformat
|
|
import re
|
|
import string
|
|
|
|
--
|
|
2.18.0.rc2
|
|
|