Merge branch 'fixiscan' of https://github.com/PaddlePaddle/Paddle into fixiscan

python/paddle/fluid/tests/unittests/test_fleet_base_3.py

@@ -49,7 +49,7 @@ class TestFleetBase(unittest.TestCase):
         optimizer.minimize(avg_cost)
 
 
-class TestFleetBase(unittest.TestCase):
+class TestFleetBase1(unittest.TestCase):
     def setUp(self):
         os.environ["POD_IP"] = "127.0.0.1"
         os.environ["PADDLE_TRAINER_ENDPOINTS"] = "127.0.0.1:36001"