def _check_add(ign):
furl1,servicedir1a = cli.add_service(serverdir,
"upload-file", (incomingdir,),
None)
self.failUnless(os.path.isdir(servicedir1a))
asd1 = os.path.abspath(servicedir1a)
self.failUnless(asd1.startswith(os.path.abspath(basedir)))
swiss1 = furl1[furl1.rfind("/")+1:]
data = server.load_service_data(serverdir)
servicedir1b = os.path.join(serverdir,
data["services"][swiss1]["relative_basedir"])
self.failUnlessEqual(os.path.abspath(servicedir1a),
os.path.abspath(servicedir1b))
# add a second service, to make sure the "find the next-highest
# available servicedir" logic works from both empty and non-empty
# starting points
furl2,servicedir2a = cli.add_service(serverdir,
"run-command", ("dummy",),
None)
self.failUnless(os.path.isdir(servicedir2a))
asd2 = os.path.abspath(servicedir2a)
self.failUnless(asd2.startswith(os.path.abspath(basedir)))
swiss2 = furl2[furl2.rfind("/")+1:]
data = server.load_service_data(serverdir)
servicedir2b = os.path.join(serverdir,
data["services"][swiss2]["relative_basedir"])
self.failUnlessEqual(os.path.abspath(servicedir2a),
os.path.abspath(servicedir2b))
def _check_add(ign):
furl, servicedir = cli.add_service(serverdir, "upload-file",
(incomingdir, ), None)
swiss = furl[furl.rfind("/") + 1:]
servicedir2 = os.path.join(serverdir, "services", swiss)
self.failUnlessEqual(os.path.abspath(servicedir),
os.path.abspath(servicedir2))
def _check_add(ign):
furl,servicedir = cli.add_service(serverdir,
"upload-file", (incomingdir,),
None)
swiss = furl[furl.rfind("/")+1:]
servicedir2 = os.path.join(serverdir, "services", swiss)
self.failUnlessEqual(os.path.abspath(servicedir),
os.path.abspath(servicedir2))
