From f78b9650d0e7b008d430673a075aad95dda863be Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Fri, 14 Aug 2015 16:40:41 -0600 Subject: Import patches-unapplied version 2.1.1-0ubuntu1 to ubuntu/wily-proposed Imported using git-ubuntu import. Changelog parent: 0afc048f2a6ff3638ecfa33e7ded5dc8dddf041a New changelog entries: * New upstream release for Ubuntu. - Switch to Python3 - Applies Ubuntu specific patches --- tests/env.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'tests/env.py') 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') - -- cgit v1.2.3