[med-svn] [Git][med-team/snakemake][debian-v7] fix debug prints

[Rebecca N. Palmer (@rnpalmer-guest)]

Rebecca N. Palmer pushed to branch debian-v7 at Debian Med / snakemake


Commits:
e5cf130d by Rebecca N. Palmer at 2024-08-02T22:30:03+01:00
fix debug prints

- - - - -


1 changed file:

- debian/patches/cancelscript_debug.patch


Changes:

=====================================
debian/patches/cancelscript_debug.patch
=====================================
@@ -11,7 +11,7 @@ Forwarded: not-needed
                      process.send_signal(signal.SIGINT)
                      time.sleep(2)
                      success = process.returncode == 0
-+                    run_stdout=process.stdout
++                    run_stdout=process.stdout.read()
          except subprocess.CalledProcessError as e:
              success = False
              print(e.stdout.decode(), file=sys.stderr)
@@ -20,7 +20,7 @@ Forwarded: not-needed
  
      if shouldfail:
 +        if shellcmd and "cancel" in shellcmd:
-+            print("cancel",run_stdout,"Workdir:")
++            print("cancel stdout:",run_stdout,"\nWorkdir:")
 +            print_tree(tmpdir, exclude=".snakemake/conda")
          assert not success, "expected error on execution"
      else:
@@ -31,13 +31,13 @@ Forwarded: not-needed
          cleanup=False,
          sigint_after=4,
      )
-+    assert os.path.exists(outdir+"/scancel.txt"), str(glob.glob(outdir))
++    assert os.path.exists(outdir+"/scancel.txt"), str(glob.glob(outdir+'/**/*',recursive=True))
      scancel_txt = open("%s/scancel.txt" % outdir).read()
      scancel_lines = scancel_txt.splitlines()
      assert len(scancel_lines) == 1
      assert scancel_lines[0].startswith("cancel")
      assert len(scancel_lines[0].split(" ")) == 3
-+    assert False, str(glob.glob(outdir))
++    assert False, str(glob.glob(outdir+'/**/*',recursive=True))
  
  
  @skip_on_windows
@@ -45,7 +45,7 @@ Forwarded: not-needed
          cleanup=False,
          sigint_after=4,
      )
-+    assert os.path.exists(outdir+"/scancel.txt"), str(glob.glob(outdir))
++    assert os.path.exists(outdir+"/scancel.txt"), str(glob.glob(outdir+'/**/*',recursive=True))
      scancel_txt = open("%s/scancel.txt" % outdir).read()
      scancel_lines = scancel_txt.splitlines()
      assert len(scancel_lines) == 2



View it on GitLab: https://salsa.debian.org/med-team/snakemake/-/commit/e5cf130dda0a362caa4374fc8de95bbbdd05ba83

-- 
View it on GitLab: https://salsa.debian.org/med-team/snakemake/-/commit/e5cf130dda0a362caa4374fc8de95bbbdd05ba83
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20240802/24069b72/attachment-0001.htm>