hi Bruce,
…
On 20/05/2020 5:46 pm, Bruce Fields wrote:
On Tue, May 19, 2020 at 07:32:37PM -0400, Chuck Lever wrote:
Looks like python3 is now a requirement for pynfs, despite the comments
and code in nfs4.0/testserver.py.
Also, the README should explain that the server under test has to permit
access from insecure source ports (this still might not be the default
for some NFS servers).
Both done, thanks for the feedback.--b.
commit e4379b69becd
Author: J. Bruce Fields <bfields@xxxxxxxxxx>
Date: Wed May 20 12:43:33 2020 -0400
Document high-port requirement for server testing
Some NFS servers by default require the client to connect from a
low-numbered port. But pynfs is meant to be runnable as a non-root
user, and as such can't necessarily get low-numbered ports.
It might be useful to at least try to get a low-numbered port, or to
give a better error message. For now, at least warn about this in the
README.
Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx>
diff --git a/README b/README
index 79cac62cb75e..a0236fb6b209 100644
--- a/README
+++ b/README
@@ -18,6 +18,10 @@ For more details about 4.0 and 4.1 testing, see nfs4.0/README and
nfs4.1/README, respectively. For information about automatic code
generation from an XDR file, see xdr/README.
+Note that any server under test must permit connections from high port
+numbers. (In the case of the NFS server, you can do this by adding
+"insecure" to the export options.)
+
Note that test results should *not* be considered authoritative
statements about the protocol--if you find that a server fails a test,
you should consult the rfc's and think carefully before assuming that
commit 39b62e990d84
Author: J. Bruce Fields <bfields@xxxxxxxxxx>
Date: Tue May 19 22:58:23 2020 -0400
Fix comments and version checks that refer to python 2
The minimum required version may actually be greater than 3.0, I'm not
sure.
for what it's worth, it requires at least v3.2, since it uses
os.fsencode(), which was introduced in that rev.
That doesn't contradict your statement, of course, and I've not checked
the rest of it.
cheers,
calum.
Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx>
diff --git a/nfs4.0/lib/rpc/rpc.py b/nfs4.0/lib/rpc/rpc.py
index cc509965f8e7..8f5ce26226d3 100644
--- a/nfs4.0/lib/rpc/rpc.py
+++ b/nfs4.0/lib/rpc/rpc.py
@@ -1,6 +1,6 @@
# rpc.py - based on RFC 1831
#
-# Requires python 2.7
+# Requires python 3
#
# Written by Fred Isaman <iisaman@xxxxxxxxxxxxxx>
# Copyright (C) 2004 University of Michigan, Center for
diff --git a/nfs4.0/nfs4client.py b/nfs4.0/nfs4client.py
index 5916dcc74139..37fbcbec9132 100755
--- a/nfs4.0/nfs4client.py
+++ b/nfs4.0/nfs4client.py
@@ -9,8 +9,8 @@
#
import sys
-if sys.hexversion < 0x02070000:
- print("Requires python 2.7 or higher")
+if sys.hexversion < 0x03000000:
+ print("Requires python 3.0 or higher")
sys.exit(1)
import os
# Allow to be run stright from package root
diff --git a/nfs4.0/nfs4lib.py b/nfs4.0/nfs4lib.py
index 9adeb81daa95..82cec4b68cee 100644
--- a/nfs4.0/nfs4lib.py
+++ b/nfs4.0/nfs4lib.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# nfs4lib.py - NFS4 library for Python
#
-# Requires python 2.7
+# Requires python 3
#
# Written by Fred Isaman <iisaman@xxxxxxxxxxxxxx>
# Copyright (C) 2004 University of Michigan, Center for
diff --git a/nfs4.0/servertests/environment.py b/nfs4.0/servertests/environment.py
index e7ef2b052833..edbd37a638a5 100644
--- a/nfs4.0/servertests/environment.py
+++ b/nfs4.0/servertests/environment.py
@@ -1,7 +1,7 @@
#
# environment.py
#
-# Requires python 2.7
+# Requires python 3
#
# Written by Fred Isaman <iisaman@xxxxxxxxxxxxxx>
# Copyright (C) 2004 University of Michigan, Center for
diff --git a/nfs4.0/testserver.py b/nfs4.0/testserver.py
index 4f31f92a1e34..d380f2d5fe83 100755
--- a/nfs4.0/testserver.py
+++ b/nfs4.0/testserver.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# nfs4stest.py - nfsv4 server tester
#
-# Requires python 2.7
+# Requires python 3
#
# Written by Fred Isaman <iisaman@xxxxxxxxxxxxxx>
# Copyright (C) 2004 University of Michigan, Center for
@@ -26,8 +26,8 @@
import sys
-if sys.hexversion < 0x02070000:
- print("Requires python 2.7 or higher")
+if sys.hexversion < 0x03000000:
+ print("Requires python 3.0 or higher")
sys.exit(1)
import os
# Allow to be run stright from package root
diff --git a/nfs4.1/client41tests/environment.py b/nfs4.1/client41tests/environment.py
index 25e7cb08ebb1..26d7368ebcb0 100644
--- a/nfs4.1/client41tests/environment.py
+++ b/nfs4.1/client41tests/environment.py
@@ -1,7 +1,7 @@
#
# environment.py
#
-# Requires python 2.7
+# Requires python 3
#
# Written by Fred Isaman <iisaman@xxxxxxxxxxxxxx>
# Copyright (C) 2004 University of Michigan, Center for
diff --git a/nfs4.1/server41tests/environment.py b/nfs4.1/server41tests/environment.py
index e7bcaa90904c..b24862b61f08 100644
--- a/nfs4.1/server41tests/environment.py
+++ b/nfs4.1/server41tests/environment.py
@@ -1,7 +1,7 @@
#
# environment.py
#
-# Requires python 2.7
+# Requires python 3
#
# Written by Fred Isaman <iisaman@xxxxxxxxxxxxxx>
# Copyright (C) 2004 University of Michigan, Center for
diff --git a/nfs4.1/testclient.py b/nfs4.1/testclient.py
index 19bd148edde2..3027419babd2 100755
--- a/nfs4.1/testclient.py
+++ b/nfs4.1/testclient.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# nfs4stest.py - nfsv4 server tester
#
-# Requires python 2.7
+# Requires python 3
#
# Written by Fred Isaman <iisaman@xxxxxxxxxxxxxx>
# Copyright (C) 2004 University of Michigan, Center for
@@ -23,8 +23,8 @@
import use_local # HACK so don't have to rebuild constantly
import sys
-if sys.hexversion < 0x02070000:
- print("Requires python 2.7 or higher")
+if sys.hexversion < 0x03000000:
+ print("Requires python 3.0 or higher")
sys.exit(1)
import os
diff --git a/nfs4.1/testmod.py b/nfs4.1/testmod.py
index 8c4ccdef5afa..0bf6bfc80fdc 100644
--- a/nfs4.1/testmod.py
+++ b/nfs4.1/testmod.py
@@ -1,6 +1,6 @@
# testmod.py - run tests from a suite
#
-# Requires python 2.7
+# Requires python 3
#
# Written by Fred Isaman <iisaman@xxxxxxxxxxxxxx>
# Copyright (C) 2004 University of Michigan, Center for
diff --git a/nfs4.1/testserver.py b/nfs4.1/testserver.py
index f3fcfe9b8851..6b1157985be9 100755
--- a/nfs4.1/testserver.py
+++ b/nfs4.1/testserver.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# nfs4stest.py - nfsv4 server tester
#
-# Requires python 2.7
+# Requires python 3
#
# Written by Fred Isaman <iisaman@xxxxxxxxxxxxxx>
# Copyright (C) 2004 University of Michigan, Center for
@@ -27,8 +27,8 @@
import use_local # HACK so don't have to rebuild constantly
import sys
-if sys.hexversion < 0x02070000:
- print("Requires python 2.7 or higher")
+if sys.hexversion < 0x03000000:
+ print("Requires python 3.0 or higher")
sys.exit(1)
import os
diff --git a/showresults.py b/showresults.py
index 0229a1e4d7b6..41d1c851721c 100755
--- a/showresults.py
+++ b/showresults.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# showresults.py - redisplay results from nfsv4 server tester output file
#
-# Requires python 2.7
+# Requires python 3
#
# Written by Fred Isaman <iisaman@xxxxxxxxxxxxxx>
# Copyright (C) 2004 University of Michigan, Center for
--
Calum Mackay
Linux Kernel Engineering
Oracle Linux and Virtualisation
