11 Commits

Author	SHA1	Message	Date
Ch3LL	60724980ec	fix test_fstype test for mac	2017-04-13 12:04:20 -04:00
rallytime	0db2b67ed4	Whitespace fix	2016-09-16 13:25:08 -06:00
rallytime	26cf545d03	Merge branch '2016.3' into 'carbon' ... Conflicts: - salt/utils/gitfs.py - tests/unit/modules/disk_test.py	2016-09-16 10:35:49 -06:00
Nicole Thomas	a4bbd5e3d7	Add resize2fs unit test from blockdev_test to disk_test (#36346) ... The blockdev module is being slowly deprecated and its functions moved to to the disk module instead. There is a test for resize2fs in the blockdev_test file in the 2015.8 branch (which matches the resize2fs function in the blockdev module), but this function was moved to the disk file in 2016.3. The test was never moved over. I discovered this during a merge forward in #36344. This PR adds the test from 2015.8 blockdev_test to the 2016.3 disk_test.py, and is adjusted to work with the disk module accordingly.	2016-09-15 14:37:53 -06:00
rallytime	f37255ed16	Move remaining blockdev func unit tests to disk unit tests and delete file	2016-08-10 16:32:14 -06:00
Mike Place	6714e8f386	Fix mock call in disk wipe test	2016-08-07 06:57:20 +09:00
Ronald van Zantvoort	33683fa992	Merge blockdev tests into disk	2015-06-23 16:52:37 +02:00
Pedro Algarvio	e465353aa1	Py3 compatibility	2015-01-30 22:27:06 +00:00
Thomas S Hatch	b8f4cc7021	more lint	2014-12-18 10:33:31 -07:00
Thomas S Hatch	cc8705bcba	lint	2014-12-18 10:15:58 -07:00
Jayesh	b69d81ee69	Added test case	2014-12-12 17:20:31 +05:30