commit f0c6261a7c9157e24cdbf49ab1e753074e1d3fa8
Author: Radek Pazdera <rpazdera(a)redhat.com>
Date: Thu Nov 8 16:17:46 2012 +0100
Resources: Turn Tests/ and test_tools/ into resources
This patch removes the Test package and turns all the tests
contained within it into resources a new concept, that will
be used to transfer tests and tools between controller and
the slaves.
Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com>
{Tests => test_modules}/TestDummyFailing.py | 0
{Tests => test_modules}/TestIcmp6Ping.py | 0
{Tests => test_modules}/TestIcmpPing.py | 0
{Tests => test_modules}/TestIperf.py | 1 -
{Tests => test_modules}/TestMulticast.py | 9 +++------
{Tests => test_modules}/TestNetCat.py | 0
{Tests => test_modules}/TestPacketAssert.py | 0
{Tests => test_modules}/TestPktCounter.py | 0
{Tests => test_modules}/TestPktgenTx.py | 0
{Tests => test_modules}/TestTCPConnect.py | 0
{Tests => test_modules}/TestTCPListen.py | 0
test_tools/multicast/lnst-setup.sh | 3 +++
12 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/Tests/TestDummyFailing.py b/test_modules/TestDummyFailing.py
similarity index 100%
rename from Tests/TestDummyFailing.py
rename to test_modules/TestDummyFailing.py
diff --git a/Tests/TestIcmp6Ping.py b/test_modules/TestIcmp6Ping.py
similarity index 100%
rename from Tests/TestIcmp6Ping.py
rename to test_modules/TestIcmp6Ping.py
diff --git a/Tests/TestIcmpPing.py b/test_modules/TestIcmpPing.py
similarity index 100%
rename from Tests/TestIcmpPing.py
rename to test_modules/TestIcmpPing.py
diff --git a/Tests/TestIperf.py b/test_modules/TestIperf.py
similarity index 99%
rename from Tests/TestIperf.py
rename to test_modules/TestIperf.py
index e928702..84c887d 100644
--- a/Tests/TestIperf.py
+++ b/test_modules/TestIperf.py
@@ -148,4 +148,3 @@ class TestIperf(TestGeneric):
return self.set_fail(message)
return self.set_pass(message)
-
diff --git a/Tests/TestMulticast.py b/test_modules/TestMulticast.py
similarity index 93%
rename from Tests/TestMulticast.py
rename to test_modules/TestMulticast.py
index 860608a..9909bcd 100644
--- a/Tests/TestMulticast.py
+++ b/test_modules/TestMulticast.py
@@ -25,7 +25,6 @@ class TestMulticast(TestGeneric):
"""
- _tools_location = "test_tools/multicast/"
_conditions = {}
@staticmethod
@@ -41,7 +40,7 @@ class TestMulticast(TestGeneric):
cmd = ""
opts = {}
- setup = self._tools_location + self.get_mopt("setup")
+ setup = self.get_mopt("setup")
opts["multicast_address"] =
self._remove_mask(self.get_opt("address"))
opts["port"] = self.get_opt("port")
opts["interface"] =
self._remove_mask(self.get_opt("interface"))
@@ -108,11 +107,9 @@ class TestMulticast(TestGeneric):
setup_name = self.get_mopt("setup")
logging.info("Started Multicast test setup {0}".format(setup_name))
- exec_cmd("cd " + self._tools_location + " && make",
- log_outputs=False)
-
cmd = self._compose_cmd()
- data_stdout = exec_cmd(cmd, die_on_err=False, log_outputs=False)[0]
+ data_stdout = self.exec_from("multicast", cmd, die_on_err=False,
+ log_outputs=False)[0]
res = {}
diff --git a/Tests/TestNetCat.py b/test_modules/TestNetCat.py
similarity index 100%
rename from Tests/TestNetCat.py
rename to test_modules/TestNetCat.py
diff --git a/Tests/TestPacketAssert.py b/test_modules/TestPacketAssert.py
similarity index 100%
rename from Tests/TestPacketAssert.py
rename to test_modules/TestPacketAssert.py
diff --git a/Tests/TestPktCounter.py b/test_modules/TestPktCounter.py
similarity index 100%
rename from Tests/TestPktCounter.py
rename to test_modules/TestPktCounter.py
diff --git a/Tests/TestPktgenTx.py b/test_modules/TestPktgenTx.py
similarity index 100%
rename from Tests/TestPktgenTx.py
rename to test_modules/TestPktgenTx.py
diff --git a/Tests/TestTCPConnect.py b/test_modules/TestTCPConnect.py
similarity index 100%
rename from Tests/TestTCPConnect.py
rename to test_modules/TestTCPConnect.py
diff --git a/Tests/TestTCPListen.py b/test_modules/TestTCPListen.py
similarity index 100%
rename from Tests/TestTCPListen.py
rename to test_modules/TestTCPListen.py
diff --git a/test_tools/multicast/lnst-setup.sh b/test_tools/multicast/lnst-setup.sh
new file mode 100755
index 0000000..2aad486
--- /dev/null
+++ b/test_tools/multicast/lnst-setup.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+make
Show replies by date