Ignore:
Timestamp:
May 7, 2018 6:47:21 AM (7 years ago)
Author:
Piotr Rozyczko <rozyczko@…>
Branches:
ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc
Children:
42787fb
Parents:
b0ba43e (diff), 80468f6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'ESS_GUI' into ESS_GUI_Pr

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingPerspectiveTest.py

    r63319b0 r80468f6  
    2727            def communicator(self): 
    2828                return GuiUtils.Communicate() 
    29             def communicate(self): 
    30                 return GuiUtils.Communicate() 
     29            communicate = GuiUtils.Communicate() 
    3130 
    3231        '''Create the perspective''' 
     
    4544        self.assertEqual(len(self.widget.tabs), 1) 
    4645        self.assertEqual(self.widget.maxIndex, 1) 
    47         self.assertEqual(self.widget.maxCSIndex, 0) 
    4846        self.assertEqual(self.widget.getTabName(), "FitPage1") 
    4947 
     
    6664        self.widget.addConstraintTab() 
    6765        self.assertEqual(len(self.widget.tabs), 2) 
    68         self.assertEqual(self.widget.getCSTabName(), "Const. & Simul. Fit1") 
    69         self.assertEqual(self.widget.maxCSIndex, 1) 
     66        self.assertEqual(self.widget.getCSTabName(), "Const. & Simul. Fit") 
    7067 
    7168    def testResetTab(self): 
Note: See TracChangeset for help on using the changeset viewer.