After the commit b0cb7aaf for bz#870589, which adds 2 tarballs
with layout patterns, Swift tests sometimes fail (depending on the
kind of filesystem they are running at and the phase of the moon).

As pattern tarball is unpacked, the underlying filesystem is free
to return directory listings in any order, and straightforward use
of '==' operator fails. As it turns out, one of the two comparisons
had set() applied to the list already. So, add it to the other one.

BUG: 874390
Change-Id: I02de99593b9567a13076113d58e242b079fde002
Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Reviewed-on: http://review.gluster.org/4165
Reviewed-by: Peter Portante <pportant@redhat.com>
Tested-by: Peter Portante <pportant@redhat.com>

Remove the "swift/1.4.8" directory from the hierarchy, replacing it with "ufo".

Change-Id: I60ba171182d7402a2193616c1c95c90cd2ead5bc
BUG: 870589
Signed-off-by: Peter Portante <peter.portante@redhat.com>
Reviewed-on: http://review.gluster.org/4200
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Pete Zaitcev <zaitcev@redhat.com>
Reviewed-by: Anand Avati <avati@redhat.com>