BUG: fix unit test on linux where too many slashes in file://. close #2564

Author: wesm

RELEASE.rst

@@ -61,6 +61,10 @@ pandas 0.10.1
     - handle correctly ``Term`` passed types (e.g. ``index<1000``, when index
       is ``Int64``), (closes GH512_)
   - Fix DataFrame.info bug with UTF8-encoded columns. (GH2576_)
+  - Fix DatetimeIndex handling of FixedOffset tz (GH2604_)
+  - More robust detection of being in IPython session for wide DataFrame
+    console formatting (GH2585_)
+  - Fix platform issues with ``file:///`` in unit test (#2564)
 
 **API Changes**
 
@@ -72,6 +76,8 @@ pandas 0.10.1
 .. _GH1277: https://github.com/pydata/pandas/issues/1277
 .. _GH2327: https://github.com/pydata/pandas/issues/2327
 .. _GH2576: https://github.com/pydata/pandas/issues/2576
+.. _GH2585: https://github.com/pydata/pandas/issues/2585
+.. _GH2604: https://github.com/pydata/pandas/issues/2604
 
 pandas 0.10.0
 =============

pandas/io/tests/test_parsers.py

@@ -102,11 +102,13 @@ def test_empty_string(self):
 
     def test_read_csv(self):
         if not py3compat.PY3:
-            fname=u"file:///"+unicode(self.csv1)
-            try:
-                df1 = read_csv(fname, index_col=0, parse_dates=True)
-            except IOError:
-                assert(False), "read_csv should accept unicode objects as urls"
+            if 'win' in sys.platform:
+                prefix = u"file:///"
+            else:
+                prefix = u"file://"
+            fname = prefix + unicode(self.csv1)
+            # it works!
+            df1 = read_csv(fname, index_col=0, parse_dates=True)
 
     def test_dialect(self):
         data = """\

pandas/tools/tests/test_merge.py

@@ -1510,8 +1510,8 @@ def test_concat_series_axis1(self):
         self.assertTrue(np.array_equal(result.columns, range(2)))
 
         # must reindex, #2603
-        s = Series(randn(5), name='A')
-        s2 = Series(randn(6), name='B')
+        s = Series(randn(3), index=['c', 'a', 'b'], name='A')
+        s2 = Series(randn(4), index=['d', 'a', 'b', 'c'], name='B')
         result = concat([s, s2], axis=1)
         expected = DataFrame({'A': s, 'B': s2})
         assert_frame_equal(result, expected)