summaryrefslogtreecommitdiff
path: root/tests/env.py
diff options
context:
space:
mode:
authorBen Howard <ben.howard@ubuntu.com>2015-08-14 16:40:41 -0600
committerusd-importer <ubuntu-server@lists.ubuntu.com>2015-08-15 14:33:21 +0000
commitade966c05615a08ba26a66d777b68821b65cabf2 (patch)
tree6328073598925959bf62e5227e6f88f0575d86a3 /tests/env.py
parent0d1d620c8c7947e4aa3b330bb667583413146984 (diff)
parent4298c5d285f55ff0b3a45e8b9139a96c64d3ffc0 (diff)
downloadvyos-walinuxagent-ade966c05615a08ba26a66d777b68821b65cabf2.tar.gz
vyos-walinuxagent-ade966c05615a08ba26a66d777b68821b65cabf2.zip
Import patches-applied version 2.1.1-0ubuntu1 to applied/ubuntu/wily-proposed
Imported using git-ubuntu import. Changelog parent: 0d1d620c8c7947e4aa3b330bb667583413146984 Unapplied parent: 4298c5d285f55ff0b3a45e8b9139a96c64d3ffc0 New changelog entries: * New upstream release for Ubuntu. - Switch to Python3 - Applies Ubuntu specific patches
Diffstat (limited to 'tests/env.py')
-rw-r--r--tests/env.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/env.py b/tests/env.py
index 513df7f..5bc6eb8 100644
--- a/tests/env.py
+++ b/tests/env.py
@@ -12,14 +12,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+# Requires Python 2.4+ and Openssl 1.0+
+#
+# Implements parts of RFC 2131, 1541, 1497 and
+# http://msdn.microsoft.com/en-us/library/cc227282%28PROT.10%29.aspx
+# http://msdn.microsoft.com/en-us/library/cc227259%28PROT.13%29.aspx
-import imp
import os
import sys
-project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-waagent = imp.load_source('waagent', os.path.join(project_root, 'waagent'))
+test_root = os.path.dirname(os.path.abspath(__file__))
+project_root = os.path.dirname(test_root)
sys.path.insert(0, project_root)
-
-waagent.LoggerInit('/dev/stdout', '/dev/null')
-