dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity
9,604 Commits 3 Branches 5 Tags
6bb0938be04bb42771bb4ab454d2949b2792e839
Commit Graph

64 Commits

Author SHA1 Message Date
DarkPhoenix
2a2d9d3456 Fix circular import issues for tests 2019-11-12 14:59:43 +03:00
Gochim
386e05be8f Fixed method naming in stats.py classes 2019-11-11 19:19:31 +02:00
Gochim
8fba988222 Added central place to get damage types and ehp sources. Added tests 2019-11-10 17:27:46 +02:00
DarkPhoenix
a028ebe198 Rework how we handle all modal dialogs 2019-08-10 01:56:43 +03:00
blitzmann
31c3101d6d Remove redundant parenthesis 2018-09-16 01:11:16 -04:00
blitzmann
b4b8a158f5 Bunch of import optimizations 2018-09-16 00:05:36 -04:00
blitzmann
0456cb2f96 Merge remote-tracking branch 'origin/master' into test-3 2018-02-16 22:26:10 -05:00
blitzmann
f66c36e42b disable tests preventing branch from passing tox 2018-02-16 17:32:45 -05:00
blitzmann
b30b3fcbf1 Merge branch 'master' into test-3 
Conflicts:
	eos/gamedata.py
	eos/saveddata/booster.py
	eos/saveddata/character.py
	gui/builtinAdditionPanes/commandView.py
	gui/builtinContextMenus/commandFits.py
	gui/builtinMarketBrowser/itemView.py
	gui/builtinMarketBrowser/marketTree.py
	gui/builtinPreferenceViews/pyfaGeneralPreferences.py
	gui/builtinShipBrowser/categoryItem.py
	gui/builtinShipBrowser/fitItem.py
	gui/builtinShipBrowser/navigationPanel.py
	gui/builtinShipBrowser/raceSelector.py
	gui/builtinShipBrowser/shipItem.py
	gui/builtinStatsViews/priceViewFull.py
	gui/builtinViews/fittingView.py
	gui/characterEditor.py
	gui/characterSelection.py
	gui/chromeTabs.py
	gui/crestFittings.py
	gui/itemStats.py
	gui/mainFrame.py
	scripts/itemDiff.py
	service/price.py
 2017-11-23 11:19:05 -05:00
blitzmann
a4950e9015 Remove the rifter test as it's not properly mocked out and recent balancing passes have since made it useless 2017-10-28 22:36:00 -04:00
Ryan Holmes
828b18d0fd py2to3 automatic conversion. Woot! 2017-06-12 16:12:45 -04:00
blitzmann
ccfd414cb3 Disable stopwatch in test (was failing due to import error) and fix bad requests version setting 2017-05-08 22:25:05 -04:00
blitzmann
6b22bd189a Merge remote-tracking branch 'jeffy/fix_unread_description' into dev, see #1099 
Conflicts:
	eos/config.py
	gui/notesView.py
	service/settings.py
 2017-05-08 00:44:29 -04:00
Ryan Holmes
5aeb3a38c8 Fit Calculation Code Cleanup (#1103) 
* Remove dirtyStorage, legacy of old fleet boosting system

* Remove withBooster flag from the recalc() function.

This was a legacy parameter dealing with the old fleet boost code, the purpose of which has changed with the addition of command boosts. We no longer have to call recalc with this particular parameter (indeed, it was forced to False in `recalc`). These were never cleaned up. We still have the withBoosters parameter for the `calculateModifiedAttributes` function, however that will be renamed and has a different meaning than it used to (used in the recursion of command fits)

* Add some comments

* Consolidate the tangled mess of conditional flags meant to determine if a fit is local/projected/command. This should make the logic flow a bit clearer.

Also rewrite a blurb about returning on a calculated fit - need to look into this a little bit more.

* fix up test to no longer pass `withBooster`
 2017-04-12 19:50:16 -04:00
Ryan Holmes
45a8aaf387 Merge pull request #1111 from Ebag333/fit_tests 
Tests for eos\saveddata\fit.
 2017-04-11 00:42:54 -04:00
jeffy-g
c07bcf6a29 Determine the necessary changes to use db with test code, 
I made necessary edits

.travis.yml
  necessary to depend on wx mod indirectly when running test code

eos\config.py
  copy from development branch, This change was necessary when using data base in test code.

service\settings.py
  copy from development branch.
  and modified SettingsProvider.getSettings and Settings.save.
  After that, we made the same as master branch except for necessary code.
  This change was necessary when using data base in test code.

and other improvement.
 2017-04-10 14:23:50 +09:00
Ebag333
d1e8f5cf5c Placeholder test (#1113) 
* Placeholder test

* pep8
 2017-04-09 22:44:28 -04:00
jeffy-g
fc7ca56f8b searching for a way to open db with minimal changes required 2017-04-10 09:33:54 +09:00
Ebag333
c2360528ee Don't flush to DB 2017-04-05 01:09:00 -07:00
Ebag333
3221fba02c Copy/pasta error 2017-04-05 00:52:35 -07:00
Ebag333
e2c0dc7e92 Tests for eos\saveddata\fit. 2017-04-05 00:42:19 -07:00
Ebag333
d2af4f7d9c Locale Tests (#1079) 
* Locale tests redo

* Add helper

* Remove line break if found.

* Fix imports

* Remove copy that snuck in

* Install language packs

* Change language pack install

* fix china language pack

* Fix tests that I accidentially broke

* Add debug print

* Don't try and parse Travis cache dirs

* Fix counting
 2017-04-02 15:53:14 -07:00
Ebag333
1daafd15e6 Tests (#1086) 
* First step in more tests

(cherry picked from commit b9af117)

* Formatting

(cherry picked from commit 5f037e6)

* Booster test fixes

* Switch to wx3.0

* try coda
* Test output

* Tweak travis

* try reduced virtualenv

* Tweak travis

* Reduce test to a single one.

* Formatting
 2017-04-02 10:26:11 -07:00
Ryan Holmes
bd043c2358 Fix for #1061 (#1068) 
Squash commit that does the following:

* Enable Council Diplo Shuttle
* Disables a test that was preventing Travis from returning success (need to look into this more later)
 2017-03-26 12:15:07 -04:00
Ebag333
21fbbf154d Try fake wx module 2017-03-24 18:00:51 -07:00
Ebag333
66c4aefc1e Add comment 2017-03-24 17:27:17 -07:00
Ebag333
5d5c95fb2c Example tests for services! General cleanup. 
(cherry picked from commit 9f41bb4)
 2017-03-24 11:15:39 -07:00
Ebag333
13305d9ee1 Use correct formula. \o/ 
(cherry picked from commit b20b6c1)
 2017-03-24 11:15:37 -07:00
Ebag333
4a9638767d use math 
(cherry picked from commit 4b75f57)
 2017-03-24 11:15:34 -07:00
Ebag333
55cd0d5000 Clean up test structure a bit 
(cherry picked from commit 320e05b)
 2017-03-24 11:15:32 -07:00
Ebag333
1da15cfde3 Add right number of levels to remove. 
(cherry picked from commit 1d0a682)
 2017-03-24 11:15:30 -07:00
Ebag333
9df0ee9a1c Comment out print 
(cherry picked from commit df48cda)
 2017-03-24 11:15:28 -07:00
Ebag333
8baeafbdc2 Rename a few tests to follow standards. Move fits into a helper so they can be reused. Add two new Eos tests. 
(cherry picked from commit f87ac4d)
 2017-03-24 11:15:25 -07:00
Ebag333
cdbd2979d2 Back to what works on Windows 
(cherry picked from commit 3401b87)
 2017-03-24 11:15:05 -07:00
Ebag333
f1d6252d8b Add pyfa path to python paths 
(cherry picked from commit dd51c38)
 2017-03-24 11:14:53 -07:00
Ebag333
38a7a50d1c move helpers functions out 
(cherry picked from commit 2047d3f)
 2017-03-24 11:14:50 -07:00
Ebag333
3ca181fce4 Add comment 
(cherry picked from commit dbbe3aa)
 2017-03-24 11:14:48 -07:00
Ebag333
9eeb01b746 Add debug output 
(cherry picked from commit f8d7012)
 2017-03-24 11:14:45 -07:00
Ebag333
9ef9a0f1fb disable import tests 
(cherry picked from commit 58ac331)
 2017-03-24 11:14:43 -07:00
Ebag333
599b5318fc Add local path 
(cherry picked from commit c9c340d)
 2017-03-24 11:14:41 -07:00
Ebag333
75df133071 Add hack to add in root path to python paths 
(cherry picked from commit 1068c41)
 2017-03-24 11:14:38 -07:00
Ebag333
403b39659c Fix tox things. 
(cherry picked from commit 60298c8)
 2017-03-24 11:14:34 -07:00
Ebag333
8d357ee282 Test more Rifter things! 
(cherry picked from commit b92f584)
 2017-03-24 11:14:32 -07:00
Ebag333
96ad687944 Baby's first (real) Eos test. 
(cherry picked from commit df51f9f)
 2017-03-24 11:14:29 -07:00
blitzman
a4d07a4611 Revert "Merge pull request #1008 from Ebag333/local_tests" 
This reverts commit 91b1b1dfc2, reversing
changes made to 53937d1723.
 2017-03-11 20:02:10 -05:00
Ryan Holmes
91b1b1dfc2 Merge pull request #1008 from Ebag333/local_tests 
Locale Testing
 2017-03-11 19:34:53 -05:00
Ebag333
4e9d2a5e18 Rename file so pytest doesn't think it's a test. 2017-02-26 08:55:29 -08:00
Ebag333
7eb193cbbb Delete test, the method being tested no longer exists. 2017-02-26 08:52:27 -08:00
Ebag333
3383153b66 Little cleanup 2017-02-25 11:23:07 -08:00
Ebag333
04b412dd5b Test walking subdirectories, and using new unicode path 2017-02-25 11:20:40 -08:00