From b8e968c79246086d12068b08f25df23238f4573a Mon Sep 17 00:00:00 2001 From: Craig Orendi Date: Thu, 1 Oct 2015 12:37:20 +0100 Subject: [PATCH] add \n to setpServer and addRedirect --- exec/testcases/xenserver/tc/dotnetagentlicensing.py | 2 +- exec/xenrt/lib/xenserver/dotnetagentlicensing.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exec/testcases/xenserver/tc/dotnetagentlicensing.py b/exec/testcases/xenserver/tc/dotnetagentlicensing.py index ac6649f44..33e4ff687 100755 --- a/exec/testcases/xenserver/tc/dotnetagentlicensing.py +++ b/exec/testcases/xenserver/tc/dotnetagentlicensing.py @@ -66,7 +66,7 @@ class DotNetAgentAdapter(object): guest.execguest("mkdir -p logs") guest.execguest(" echo \"file contents\" > store/dotNetAgent.msi") msi = {"dotNetAgent" : SSFile("dotNetAgent.msi","store/")} - guest.execguest("python -m SimpleHTTPServer {0} > logs/server{0}.log 2>&1&".format(str(port))) + guest.execguest("python -m SimpleHTTPServer {0} > logs/server{0}.log 2>&1&\n".format(str(port))) return SimpleServer(str(port), msi, guest) class DotNetAgentTestCases(xenrt.TestCase): diff --git a/exec/xenrt/lib/xenserver/dotnetagentlicensing.py b/exec/xenrt/lib/xenserver/dotnetagentlicensing.py index ea02d746b..d0d1afd06 100755 --- a/exec/xenrt/lib/xenserver/dotnetagentlicensing.py +++ b/exec/xenrt/lib/xenserver/dotnetagentlicensing.py @@ -52,7 +52,7 @@ class SimpleServer(object): self.ssFiles.pop(key,None) def addRedirect(self): - self.guest.execguest("printf \"HTTP/1.1 301 Moved Permanently\\nLocation: http://%s:16000\\n\" | nc -l 15000&"%(self.getIP())) + self.guest.execguest("printf \"HTTP/1.1 301 Moved Permanently\\nLocation: http://%s:16000\\n\" | nc -l 15000&\n"%(self.getIP())) def getIP(self): return self.guest.getIP() -- 2.39.5