summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2019-02-23 18:51:46 +0100
committerGitHub <noreply@github.com>2019-02-23 18:51:46 +0100
commitbea06ac613befbba4ca30a75a0492f5bd959d3ca (patch)
tree283b522a456415a024ce6417fabb984a43efe273 /nixos
parentce019e775fd412d1522d3f0b232766ab1bd8dd7d (diff)
parentc5ddcfe69f31b8c494c232a747167cd81d09c31b (diff)
downloadnixpkgs-bea06ac613befbba4ca30a75a0492f5bd959d3ca.tar
nixpkgs-bea06ac613befbba4ca30a75a0492f5bd959d3ca.tar.gz
nixpkgs-bea06ac613befbba4ca30a75a0492f5bd959d3ca.tar.bz2
nixpkgs-bea06ac613befbba4ca30a75a0492f5bd959d3ca.tar.lz
nixpkgs-bea06ac613befbba4ca30a75a0492f5bd959d3ca.tar.xz
nixpkgs-bea06ac613befbba4ca30a75a0492f5bd959d3ca.tar.zst
nixpkgs-bea06ac613befbba4ca30a75a0492f5bd959d3ca.zip
Merge pull request #56217 from aanderse/beanstalk
nixos/beanstalkd: update test to use python3 instead of python2
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/beanstalkd.nix12
1 files changed, 7 insertions, 5 deletions
diff --git a/nixos/tests/beanstalkd.nix b/nixos/tests/beanstalkd.nix
index 9b7ac111a57..fa2fbc2c92a 100644
--- a/nixos/tests/beanstalkd.nix
+++ b/nixos/tests/beanstalkd.nix
@@ -1,23 +1,25 @@
 import ./make-test.nix ({ pkgs, lib, ... }:
 
 let
+  pythonEnv = pkgs.python3.withPackages (p: [p.beanstalkc]);
+
   produce = pkgs.writeScript "produce.py" ''
-    #!${pkgs.python2.withPackages (p: [p.beanstalkc])}/bin/python
+    #!${pythonEnv.interpreter}
     import beanstalkc
 
     queue = beanstalkc.Connection(host='localhost', port=11300, parse_yaml=False);
-    queue.put('this is a job')
-    queue.put('this is another job')
+    queue.put(b'this is a job')
+    queue.put(b'this is another job')
   '';
 
   consume = pkgs.writeScript "consume.py" ''
-    #!${pkgs.python2.withPackages (p: [p.beanstalkc])}/bin/python
+    #!${pythonEnv.interpreter}
     import beanstalkc
 
     queue = beanstalkc.Connection(host='localhost', port=11300, parse_yaml=False);
 
     job = queue.reserve(timeout=0)
-    print job.body
+    print(job.body.decode('utf-8'))
     job.delete()
   '';