From 10b3e3051c53d0c00d2d731d335a8265660ed21a Mon Sep 17 00:00:00 2001 From: philsmd Date: Tue, 13 Oct 2020 10:12:10 +0200 Subject: [PATCH] tests: use python3/pip3 instead of just python/pip --- tools/install_modules.sh | 10 +++++----- tools/test_modules/m11700.pm | 2 +- tools/test_modules/m11750.pm | 2 +- tools/test_modules/m11760.pm | 2 +- tools/test_modules/m11800.pm | 2 +- tools/test_modules/m11850.pm | 2 +- tools/test_modules/m11860.pm | 2 +- tools/test_modules/m20011.pm | 12 ++++++------ tools/test_modules/m20012.pm | 12 ++++++------ tools/test_modules/m20013.pm | 12 ++++++------ 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/tools/install_modules.sh b/tools/install_modules.sh index 731ae89c5..3d57f31d2 100755 --- a/tools/install_modules.sh +++ b/tools/install_modules.sh @@ -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+$?)) diff --git a/tools/test_modules/m11700.pm b/tools/test_modules/m11700.pm index 52e05c9b1..8a0c250f6 100644 --- a/tools/test_modules/m11700.pm +++ b/tools/test_modules/m11700.pm @@ -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; } diff --git a/tools/test_modules/m11750.pm b/tools/test_modules/m11750.pm index 8175e8b01..26dda12c8 100644 --- a/tools/test_modules/m11750.pm +++ b/tools/test_modules/m11750.pm @@ -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); diff --git a/tools/test_modules/m11760.pm b/tools/test_modules/m11760.pm index badaa1504..d8ee17c63 100644 --- a/tools/test_modules/m11760.pm +++ b/tools/test_modules/m11760.pm @@ -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); diff --git a/tools/test_modules/m11800.pm b/tools/test_modules/m11800.pm index c6b350d4f..bc4ec3c74 100644 --- a/tools/test_modules/m11800.pm +++ b/tools/test_modules/m11800.pm @@ -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; } diff --git a/tools/test_modules/m11850.pm b/tools/test_modules/m11850.pm index e93a31dac..54fac13c8 100644 --- a/tools/test_modules/m11850.pm +++ b/tools/test_modules/m11850.pm @@ -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); diff --git a/tools/test_modules/m11860.pm b/tools/test_modules/m11860.pm index 37e9cbd8c..705bf81ce 100644 --- a/tools/test_modules/m11860.pm +++ b/tools/test_modules/m11860.pm @@ -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); diff --git a/tools/test_modules/m20011.pm b/tools/test_modules/m20011.pm index 18ef71468..d603545d5 100644 --- a/tools/test_modules/m20011.pm +++ b/tools/test_modules/m20011.pm @@ -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; diff --git a/tools/test_modules/m20012.pm b/tools/test_modules/m20012.pm index 93ed77dca..0ecb0d142 100644 --- a/tools/test_modules/m20012.pm +++ b/tools/test_modules/m20012.pm @@ -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; diff --git a/tools/test_modules/m20013.pm b/tools/test_modules/m20013.pm index f5563f339..81cca9454 100644 --- a/tools/test_modules/m20013.pm +++ b/tools/test_modules/m20013.pm @@ -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;