Merge pull request #2578 from philsmd/use_python3_and_pip3

tests: use python3/pip3 instead of just python/pip
pull/2407/merge
Jens Steube 4 years ago committed by GitHub
commit 1a6d8c6f97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -64,13 +64,13 @@ cpan install Authen::Passphrase::LANManager \
ERRORS=$((ERRORS+$?))
pip install pygost
pip3 install pygost
# pip uninstall -y pycryptoplus pycrypto pycryptodome
# pip3 uninstall -y pycryptoplus pycrypto pycryptodome
pip install pycryptoplus
pip uninstall -y pycryptodome
pip install pycrypto
pip3 install pycryptoplus
pip3 uninstall -y pycryptodome
pip3 install pycrypto
ERRORS=$((ERRORS+$?))

@ -26,7 +26,7 @@ print (binascii.hexlify (digest[::-1]).decode (), end = "")
END_CODE
my $hash = `python -c '$python_code'`;
my $hash = `python3 -c '$python_code'`;
return $hash;
}

@ -27,7 +27,7 @@ print (binascii.hexlify (digest[::-1]).decode (), end = "")
END_CODE
my $digest = `python -c '$python_code'`;
my $digest = `python3 -c '$python_code'`;
my $hash = sprintf ("%s:%s", $digest, $salt);

@ -27,7 +27,7 @@ print (binascii.hexlify (digest[::-1]).decode (), end = "")
END_CODE
my $digest = `python -c '$python_code'`;
my $digest = `python3 -c '$python_code'`;
my $hash = sprintf ("%s:%s", $digest, $salt);

@ -24,7 +24,7 @@ print (binascii.hexlify (digest[::-1]).decode (), end = "")
END_CODE
my $hash = `python -c '$python_code'`;
my $hash = `python3 -c '$python_code'`;
return $hash;
}

@ -28,7 +28,7 @@ print (binascii.hexlify (digest[::-1]).decode (), end = "")
END_CODE
my $digest = `python -c '$python_code'`;
my $digest = `python3 -c '$python_code'`;
my $hash = sprintf ("%s:%s", $digest, $salt);

@ -28,7 +28,7 @@ print (binascii.hexlify (digest[::-1]).decode (), end = "")
END_CODE
my $digest = `python -c '$python_code'`;
my $digest = `python3 -c '$python_code'`;
my $hash = sprintf ("%s:%s", $digest, $salt);

@ -48,7 +48,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/;
my $output_buf = `python -c '$python_code'`;
my $output_buf = `python3 -c '$python_code'`;
$output_buf =~ s/[\r\n]//g;
@ -91,7 +91,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/;
my $output_buf = `python -c '$python_code'`;
my $output_buf = `python3 -c '$python_code'`;
$output_buf =~ s/[\r\n]//g;
@ -136,7 +136,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/;
my $output_buf = `python -c '$python_code'`;
my $output_buf = `python3 -c '$python_code'`;
$output_buf =~ s/[\r\n]//g;
@ -179,7 +179,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/;
my $output_buf = `python -c '$python_code'`;
my $output_buf = `python3 -c '$python_code'`;
$output_buf =~ s/[\r\n]//g;
@ -224,7 +224,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/;
my $output_buf = `python -c '$python_code'`;
my $output_buf = `python3 -c '$python_code'`;
$output_buf =~ s/[\r\n]//g;
@ -267,7 +267,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/;
my $output_buf = `python -c '$python_code'`;
my $output_buf = `python3 -c '$python_code'`;
$output_buf =~ s/[\r\n]//g;

@ -48,7 +48,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/;
my $output_buf = `python -c '$python_code'`;
my $output_buf = `python3 -c '$python_code'`;
$output_buf =~ s/[\r\n]//g;
@ -91,7 +91,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/;
my $output_buf = `python -c '$python_code'`;
my $output_buf = `python3 -c '$python_code'`;
$output_buf =~ s/[\r\n]//g;
@ -136,7 +136,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/;
my $output_buf = `python -c '$python_code'`;
my $output_buf = `python3 -c '$python_code'`;
$output_buf =~ s/[\r\n]//g;
@ -179,7 +179,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/;
my $output_buf = `python -c '$python_code'`;
my $output_buf = `python3 -c '$python_code'`;
$output_buf =~ s/[\r\n]//g;
@ -224,7 +224,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/;
my $output_buf = `python -c '$python_code'`;
my $output_buf = `python3 -c '$python_code'`;
$output_buf =~ s/[\r\n]//g;
@ -267,7 +267,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/;
my $output_buf = `python -c '$python_code'`;
my $output_buf = `python3 -c '$python_code'`;
$output_buf =~ s/[\r\n]//g;

@ -48,7 +48,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/;
my $output_buf = `python -c '$python_code'`;
my $output_buf = `python3 -c '$python_code'`;
$output_buf =~ s/[\r\n]//g;
@ -91,7 +91,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/;
my $output_buf = `python -c '$python_code'`;
my $output_buf = `python3 -c '$python_code'`;
$output_buf =~ s/[\r\n]//g;
@ -136,7 +136,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/;
my $output_buf = `python -c '$python_code'`;
my $output_buf = `python3 -c '$python_code'`;
$output_buf =~ s/[\r\n]//g;
@ -179,7 +179,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/;
my $output_buf = `python -c '$python_code'`;
my $output_buf = `python3 -c '$python_code'`;
$output_buf =~ s/[\r\n]//g;
@ -224,7 +224,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/;
my $output_buf = `python -c '$python_code'`;
my $output_buf = `python3 -c '$python_code'`;
$output_buf =~ s/[\r\n]//g;
@ -267,7 +267,7 @@ END_CODE
$python_code =~ s/key_tweak/"$key_tweak"/;
$python_code =~ s/data/"$data_base64"/;
my $output_buf = `python -c '$python_code'`;
my $output_buf = `python3 -c '$python_code'`;
$output_buf =~ s/[\r\n]//g;

Loading…
Cancel
Save