Change in vdsm[master]: fileUtils: Normalize initial double slashes

[Nir Soffer]

Nir Soffer has uploaded a new change for review.

Change subject: fileUtils: Normalize initial double slashes
......................................................................

fileUtils: Normalize initial double slashes

POSIX allows both /path and //path. The second slash may be interpreted
in an implementation-defined manner. The Linux interpretation seems to
be to ignore the double slash, so it seems to be safe to remove it.

See https://bugs.python.org/issue26329 for more info.

Change-Id: Ifa3f8724e9a423263b5676d691308d0188b26935
Bug-Url: XXX
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com&gt;
---
M lib/vdsm/storage/fileUtils.py
M tests/fileUtilTests.py
2 files changed, 20 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/78/61578/1

diff --git a/lib/vdsm/storage/fileUtils.py b/lib/vdsm/storage/fileUtils.py
index fcd8829..49ee937 100644
--- a/lib/vdsm/storage/fileUtils.py
+++ b/lib/vdsm/storage/fileUtils.py
@@ -36,8 +36,6 @@
 import types
 import warnings
 
-from os.path import normpath
-
 import six
 
 from vdsm import constants
@@ -106,6 +104,22 @@
     return address.hosttail_join(host, tail)
 
 
+def normpath(path):
+    """
+    Normalize file system path.
+
+    POSIX allows both /path and //path. The second slash may be interpreted in
+    an implementation-defined manner. The Linux interpretation seems to be to
+    ignore the double slash, so it seems to be safe to remove it.
+
+    See https://bugs.python.org/issue26329 for more info.
+    """
+    path = os.path.normpath(path)
+    if path.startswith('//'):
+        path = path[1:]
+    return path
+
+
 def is_port(port_str):
     if port_str.startswith('0'):
         return False
diff --git a/tests/fileUtilTests.py b/tests/fileUtilTests.py
index a9a7270..ec4c278 100644
--- a/tests/fileUtilTests.py
+++ b/tests/fileUtilTests.py
@@ -180,10 +180,14 @@
     @permutations([
         # Remote paths without a port
         ("server:/path", "server:/path"),
+        ("server://path", "server:/path"),
+        ("server:///path", "server:/path"),
         ("server:/path/", "server:/path"),
         ("server:/pa:th", "server:/pa:th"),
         ("server:/path//", "server:/path"),
         ("server:/", "server:/"),
+        ("server://", "server:/"),
+        ("server:///", "server:/"),
         ("12.34.56.78:/", "12.34.56.78:/"),
         ("[2001:db8::60fe:5bf:febc:912]:/",
"[2001:db8::60fe:5bf:febc:912]:/"),
         ("server:01234:/", "server:01234:"),


-- 
To view, visit https://gerrit.ovirt.org/61578
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa3f8724e9a423263b5676d691308d0188b26935
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com&gt;

gerrit-hooks has posted comments on this change.

Change subject: fileUtils: Normalize initial double slashes
......................................................................


Patch Set 1:

* Update tracker: IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and
is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6',
'ovirt-4.0'])

-- 
To view, visit https://gerrit.ovirt.org/61578
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ifa3f8724e9a423263b5676d691308d0188b26935
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;
Gerrit-HasComments: No

gerrit-hooks has posted comments on this change.

Change subject: fileUtils: Normalize initial double slashes
......................................................................


Patch Set 2:

* #1361182::Update tracker: OK
* Check Bug-Url::OK
* Check Public Bug::#1361182::OK, public bug
* Check Product::#1361182::OK, Correct classification oVirt
* Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-4.0)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6',
'ovirt-4.0'])

-- 
To view, visit https://gerrit.ovirt.org/61578
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ifa3f8724e9a423263b5676d691308d0188b26935
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com&gt;
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt;
Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com&gt;
Gerrit-Reviewer: Idan Shaby <ishaby(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;
Gerrit-HasComments: No

Idan Shaby has posted comments on this change.

Change subject: fileUtils: Normalize initial double slashes
......................................................................


Patch Set 2: Code-Review+1 Verified+1

-- 
To view, visit https://gerrit.ovirt.org/61578
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ifa3f8724e9a423263b5676d691308d0188b26935
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com&gt;
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt;
Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com&gt;
Gerrit-Reviewer: Idan Shaby <ishaby(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;
Gerrit-HasComments: No

Adam Litke has posted comments on this change.

Change subject: fileUtils: Normalize initial double slashes
......................................................................


Patch Set 2: Code-Review+2

-- 
To view, visit https://gerrit.ovirt.org/61578
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ifa3f8724e9a423263b5676d691308d0188b26935
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com&gt;
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt;
Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com&gt;
Gerrit-Reviewer: Idan Shaby <ishaby(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;
Gerrit-HasComments: No

Adam Litke has submitted this change and it was merged.

Change subject: fileUtils: Normalize initial double slashes
......................................................................


fileUtils: Normalize initial double slashes

POSIX allows both /path and //path. The second slash may be interpreted
in an implementation-defined manner. The Linux interpretation seems to
be to ignore the double slash, so it seems to be safe to remove it.

See https://bugs.python.org/issue26329 for more info.

Change-Id: Ifa3f8724e9a423263b5676d691308d0188b26935
Bug-Url: https://bugzilla.redhat.com/1361182
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com&gt;
Reviewed-on: https://gerrit.ovirt.org/61578
Reviewed-by: Idan Shaby <ishaby(a)redhat.com&gt;
Tested-by: Idan Shaby <ishaby(a)redhat.com&gt;
Continuous-Integration: Jenkins CI
Reviewed-by: Adam Litke <alitke(a)redhat.com&gt;
---
M lib/vdsm/storage/fileUtils.py
M tests/fileUtilTests.py
2 files changed, 20 insertions(+), 2 deletions(-)

Approvals:
  Adam Litke: Looks good to me, approved
  Jenkins CI: Passed CI tests
  Idan Shaby: Verified; Looks good to me, but someone else must approve



-- 
To view, visit https://gerrit.ovirt.org/61578
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa3f8724e9a423263b5676d691308d0188b26935
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com&gt;
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt;
Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com&gt;
Gerrit-Reviewer: Idan Shaby <ishaby(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;

gerrit-hooks has posted comments on this change.

Change subject: fileUtils: Normalize initial double slashes
......................................................................


Patch Set 3:

* #1361182::Update tracker: OK
* Set MODIFIED::bug 1361182::::#1361182::::IGNORE, not all related patches are closed,
check 61579

-- 
To view, visit https://gerrit.ovirt.org/61578
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ifa3f8724e9a423263b5676d691308d0188b26935
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com&gt;
Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com&gt;
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt;
Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com&gt;
Gerrit-Reviewer: Idan Shaby <ishaby(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;
Gerrit-HasComments: No